Don't leak the values here. (#169047, Philip Langdale)

2005-03-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtksettings.c (gtk_settings_get_property):
	* gtk/gtkrc.c (gtk_rc_parse_assignment): Don't leak
	the values here.  (#169047, Philip Langdale)

diff --git a/ChangeLog b/ChangeLog
index 2408bc42d0a875753130dc384919ebacf4ae59c7..dcd93a575ee00ea9f0025fa0d5da58e41e22505c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksettings.c (gtk_settings_get_property): 
+       * gtk/gtkrc.c (gtk_rc_parse_assignment): Don't leak 
+       the values here.  (#169047, Philip Langdale)
+
        * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): 
        Don't warn if a stock icon cannot be found.  (#168830,
        Sven Neumann)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2408bc42d0a875753130dc384919ebacf4ae59c7..dcd93a575ee00ea9f0025fa0d5da58e41e22505c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-03-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksettings.c (gtk_settings_get_property): 
+       * gtk/gtkrc.c (gtk_rc_parse_assignment): Don't leak 
+       the values here.  (#169047, Philip Langdale)
+
        * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): 
        Don't warn if a stock icon cannot be found.  (#168830,
        Sven Neumann)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2408bc42d0a875753130dc384919ebacf4ae59c7..dcd93a575ee00ea9f0025fa0d5da58e41e22505c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-03-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksettings.c (gtk_settings_get_property): 
+       * gtk/gtkrc.c (gtk_rc_parse_assignment): Don't leak 
+       the values here.  (#169047, Philip Langdale)
+
        * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): 
        Don't warn if a stock icon cannot be found.  (#168830,
        Sven Neumann)

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 08b7721a83faa8ed74b2bc6a29489448a70e4e05..0dd4a521977609563347dcee0342b7d50fcbf488 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -2312,7 +2312,7 @@ gtk_rc_parse_assignment (GScanner      *scanner,
            {
              g_string_append_c (gstring, ' ');
              g_value_init (&prop->value, G_TYPE_GSTRING);
-             g_value_set_static_boxed (&prop->value, gstring);
+             g_value_take_boxed (&prop->value, gstring);
            }
          else
            g_string_free (gstring, TRUE);

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 4aec31559f5e6a34158c0543f15e9fa950858956..f74f5cc2652c7d44f3e0c65f343a9252f7f9e2d7 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -572,8 +572,8 @@ gtk_settings_get_property (GObject     *object,
           
           g_value_init (&gstring_value, G_TYPE_GSTRING);
 
-          g_value_set_boxed (&gstring_value,
-                             g_string_new (g_value_get_string (&val)));
+          g_value_take_boxed (&gstring_value,
+                              g_string_new (g_value_get_string (&val)));
 
           g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));